Resolve merge conflicts in chisel3.5.6 bump #1430
+2
−2
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.